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

Change-Id: I18b4e8c975342a0b79d9a88082c1e9b4f0a6682b