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

Change-Id: I53fe91a7fcb745accf0e660b675b53f76aa55734