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

Change-Id: I01a0dc064168b77fbac0a8a1c438b100409287a9