Merge "Update documentation" am: ae25b62203 am: ea992811ff
am: 1cf81ee892

Change-Id: Ica4407926ea618b6c3d1bafdf80d97f2b51d752b