Merge "Merge "Avoid cross compilation error in DoCallCommon" am: 22ae7b3b3b am: 3fe7a46d00" into oc-dev-plus-aosp
am: b475ca1921

Change-Id: Id8484d032f5817fda837eb533d040a275e2747be