Fix some nits or typos found by chance

Change-Id: I42b9b3e377f01ff9612768f76c7d05fc5e379f0a
Merge "Fix some nits or typos found by chance"