Merge "Merge "Fix NativeCallbackThread race condition." into oc-mr1-dev am: 63643cedf2 am: 7bf620f494"