Merge "Fix misleading comments" am: 384a6820cb
am: 814299c5a3

Change-Id: I407bbde1ac0350e1e102c16a0e90d3e6c6074c98