Merge "Fixed WTF that happens on race condition." into oc-dev am: 461fd10d6a
am: 4eb5fa416e

Change-Id: I8060bcc803ac4873d9ad37a6ccd9b2f8e089bf52