DO NOT MERGE leanback: Lint fixes
am: 3536c10318  -s ours

Change-Id: I82225ecf8763bdf00d7d02336287157b2c70c18b