Merge "Revert "Fix race in CommitCodeInternal and cleanup"" am: 0d3f4803 am: 53f1645c am: 0153bbc9 am: e3b9eca5 Change-Id: Iea40559174c62d77ef7a0b6ebd2db56b8d1935e0