Merge "Enable strict warning checks and fix" into nyc-mr1-dev