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

Change-Id: I6378b85f7a1d4857679e0a04455d35accbccc3af