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

Change-Id: Ia76cd6f22c4d9eb7f6c3425b8972e94aeebf8cf6