Merge \\"Fix early termination of while loop in BluetoothSocket#write\\" into nyc-mr1-dev am: ac1873b2fc
am: eb7dc19a1a

Change-Id: Ice60ffc37dbbcc317cad8db04e01234e7e923cf8