Remove superfluous spaces and doc tweak

Change-Id: I3755b31a1fc9b9930fc41ef44242d0bd12dc26d8
Merge "Remove superfluous spaces and doc tweak"