Merge "Emma: Suppress MissingOverride warnings"
am: 2488a22acf

Change-Id: I26994bfb5c3df9368ef67e8af5aaa479f30dd4dd