Merge \"Merge \\\"Fixes lint errors\\\" into nyc-dev am: 0f55c80c am: a20824ae\" into nyc-mr1-dev-plus-aosp am: 38744dcc Change-Id: I66d7cbc2d6b6b68a87797571e2a7c188f55e587f