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

Change-Id: I8fe7292b71866ac93b95f496eee300cf6f6734ab