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

Change-Id: I23a50f9a87177b86f86306a3484baad1e82e812c