Merge "Fix overloaded virtual function warning" into oc-dev-plus-aosp