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

Change-Id: Id3b9a1e0797f26d34415938dee0a032541be2a6c