Merge "Protect against possible race conditions" into oc-dev am: 21076bf34e am: dc31a5d47c
am: 516a132ea8

Change-Id: I153eadd1b4b71d6b6af5952592097e699aefd15d