Merge "Update documentation" am: ae25b62203
am: ea992811ff

Change-Id: Ic4d2927b28a1684f2bd926be8c27b2215104d5c6