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

Change-Id: I7589eb74347d77a109b2eb25c72aa9bd70dbd420