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

Change-Id: I9c65fa9d05ece610a435265d10fe9fa87123fbd4