Merge "Revert "DO NOT MERGE Verify that remote exceptions will not cause object leaks"" into oreo-cts-dev