Merge \"Fixes lint warnings am: c5e58d5a am: d4028d6a am: f9621c9a\" into nyc-mr1-dev-plus-aosp am: 882699fc Change-Id: If5566389ec2f3d1309ee5b846bde8843721bbb41