Merge \"Merge \\\\"Fixes lint warnings\\\\" into nyc-dev am: 9adc0ea3 am: d8c5ef30 am: 417b24d7\" into nyc-mr1-dev-plus-aosp am: 5bf1192e Change-Id: If5e39cd0b3fe2a9fced7ed1903ee52d4b74a2f39