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

Change-Id: Ia59c557b6c2d6366245cc1cd42d445ca15789c2c