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

Change-Id: I8b9583d2f456c6daf9558827a6c250b25c04e9ca