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

Change-Id: Ife4a8509bd3c34cee68deafb23833091d415adda