Merge "Remove misleading comment (b/26948053)" am: dbeebf56aa am: 4f70554179 am: 32b7443757
am: 6984a92aa9

Change-Id: I01c7376d6e25796eaa9448506d17eb318f3bdedb