Merge "Avoid cross compilation error in DoCallCommon"
am: 22ae7b3b3b

Change-Id: If438180b80205a2d39982acc1b64956235ac0ee3