Merge "Fix race in CommitCodeInternal and cleanup" am: 4075f08db8
am: d8d201a24f

Change-Id: I18ccab826109739900828397d49467038973d2de