Merge "Antlr: Suppress MissingOverride" am: 7c41f2190a am: f27dca5549
am: 4eceaa3358

Change-Id: I677e1d9ddc3dbcf2dab1ae3e7e058279fdfe0dd2