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

Change-Id: I1ba1c16c15ea121fff71e38fe9acb6dff25e16a4