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

Change-Id: Ib9d41a2001ec6831cbd7e23dc81908dc32a041e7