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