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

Change-Id: I8b68a90f11d2b7b66085609a122515a68bac48bb