Merge "Fix race condition crash" into oc-mr1-dev am: 8170ea1b3c
am: f15a9b984a

Change-Id: I0720e0244e40db6fa42a6f885d21279a7eb90cd7