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