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

Change-Id: I7488839fcfd129112620a0c16a4fa66a6ec24672