Update comments a bit

Change-Id: I12992379c7d87db4145ee7090f0fdd1622d3a797
Merge "Update comments a bit"