Merge "Fix race condition in binder thread" into oc-dr1-dev
am: 33e014b9bc

Change-Id: I5e98f321a23a5c99b321c10c59bbbc55b308bbf9