Merge "Merge "Merge "Merge "Avoid cross compilation error in DoCallCommon" am: 22ae7b3b3b" into stage-aosp-master am: d0b2a8c52e" into oc-dev-plus-aosp am: 5482c6cc39" into oc-dr1-dev-plus-aosp