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

Change-Id: I305602d326828fd809825ecb74877fc436546ee2