Merge "Bugfix: add "override" explicitly to make the compiler happy" into rvc-dev am: 8f3fee6216 am: cd8a78f7bd am: bf40d79376 am: ac3371c7e5

Change-Id: Ibe6c2eeca13ac788e9bcaebe0d04dcd832bce534