Merge "Fix for testManagedCall" into pie-cts-dev
am: e2840b7315

Change-Id: I19f1c039bc0abec38ef3d7b438d56f9dce242302