Merge "Bugfix: add "override" explicitly to make the compiler happy" into...
Merge "Bugfix: add "override" explicitly to make the compiler happy" into rvc-dev am: 8f3fee62 am: cd8a78f7 am: bf40d793
Change-Id: I7488839fcfd129112620a0c16a4fa66a6ec24672