Merge "Merge "Update documentation" into udc-dev am: 565611aaee am: 11096d7706"