Merge "DO NOT MERGE leanback: Lint fixes" into nyc-mr1-dev