Merge "Bugfix: add "override" explicitly to make the compiler happy" into rvc-dev am: 8f3fee6216 am: 72d170ffb7

Change-Id: Ibb923a67fbf370283fc58fa811e9eb45d6fdb7f2