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

Change-Id: Ia62892e59060e9922221865997763769c154b18b