Merge "Add missing override keyword" am: 8a1fb91e14 am: 29f853d2e1
am: b28cf0769d

Change-Id: I8e15d8e3d8590949a534ccb80663c4bc008655d5