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

Change-Id: I1b335d648e0977bfc3dc8e2141030ce6bc3f4b67