Merge "Fix a racing condition in ProcessRecord"
am: 9027191b08

Change-Id: I6bfef15873b88a2bed739ee6cb238555d96deaad