Merge \"Fix build due to missing abstract method impl\" into nyc-dev
am: aeef7c4748

Change-Id: I38fc7c88e9c4ea5abf50a0bec5f2302c4622605f