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

Change-Id: I3297cbab9d819db117e64a669bd868a02b6b033c