Merge "Documentation improvements" am: cee583bc53
am: 06979c821e

Change-Id: I700f7e4f9a57695efb55c3792646fe2a2a995bb5