Merge "Fix some comments"
am: b4f3950709

Change-Id: I8e71d0b392970c971648b5e63e8c085dd4f5f8a7