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

Change-Id: I96d6ae526eac5c0e39057d4ae67765e63861f1f9