Merge "Small documentation and stylistic changes." am: 878124c13b am: 4a3678c6ae
am: c92566904b

Change-Id: I2b3641e4f4a4ee9db7ca40191a894c3e1237e6d5