Merge "Pass valid file descriptor to binder" am: 0013d45b27
am: 83882781ac

Change-Id: I6058cc21b3c38ba8ea3a572f49ac944db36507ae