Merge "Fix a compilation error due to 1.8 type inference differences" into nyc-dev