Merge "Merge "Avoid cross compilation error in DoCallCommon" am: 22ae7b3b am: 3fe7a46d" into oc-dev-plus-aosp