Merge "Fix lint warnings." into nyc-dev am: e680cef70f
am: 24165a8f7b

Change-Id: I2589067cc6eb7f7d5d08ac43060cbe7a4449a7e6