Merge "Emma: Suppress MissingOverride warnings" am: 2488a22acf am: 706655d13d
am: 6b4939f645

Change-Id: I7a7d78fc9f3189ddc6afc07f3d537a049db2bea8