Merge "Merge "Fix for testManagedCall" into pie-cts-dev am: e2840b7315" am: 88eba0a15e
am: 3cbb33d8d8

Change-Id: I71ca7270fb53c5326865ef7c50f047411763d655