Doc improvements

Change-Id: I115d2120adb9381cd9ec0927cdd5a9a1a4d61082