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

Change-Id: I5e80132e639434dfa5edbaae62d82aa8ae6d4763