Merge "Update documentation"
am: ae25b62203

Change-Id: Idbe416dbd182eea082c67de330f38f3696f81b11