Merge "Avoid waiting from polling binder threads"
am: 29e3092879

Change-Id: I36d42735ca6cff82147d6f78f0da5d1034169a10