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

Change-Id: I2360c6d049352c4e32f33096d3f659d636941417