Merge "Whitelist new lint errors"
am: be64b53449

Change-Id: I89af3be9e173478268d18bcd0d5d35024e6793de