Merge "Whitelist new lint errors" am: be64b53449 am: 4f685a77a5

Change-Id: I00c37c7533cfc0ea31ba66e36f8a4062d9c75a3d