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