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

Change-Id: I8eb6e8ce288bb3ea2930459717486fc24702060d