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

Change-Id: Id677fd487e7698f413a772b72eb5296c5d95b56a