Merge "Merge \\\"Fixes lint errors\\\" into nyc-dev am: 0f55c80c am: d41bdf4c am: 4085e831" into nyc-mr1-dev-plus-aosp