Merge "Documentation improvements"
am: cee583bc53

Change-Id: I8d1d1195d629dc6432155454fb4fafaf90400248