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