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

Change-Id: I9d12601b4db0108f313c1a69ada67c92929f548b