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

Change-Id: Ic24793e62fbf8be2d43f8742a4e775487e6982f0