[automerger skipped] Merge "Whitelist new lint errors" am: be64b53449 am: 4f685a77a5 am: e2f35e7bbb -s ours
am skip reason: Change-Id Id89b15ba34df01584d3d5afe9d4112fad9613dbc with SHA-1 3e8f84f82f is in history

Change-Id: Iae96081fcc2c95efd723bca9f8fe1e032779015d