Merge "Fix misleading comments"
am: 384a6820cb

Change-Id: Id18dcbdc62738fcbd35a8f493d4fa662c7b2b16b