Merge "Add the missing overriden API" into nyc-dev