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

Change-Id: Ia979f59a48096e730d703831701b46fffc74f1d8