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

Change-Id: Ibda6f5f36af85be82f6f09e3d9f55ae50bed9abe