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

Change-Id: Ic8f779572df60df4c6378a4d8acdd35d61696921