[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am: 0a8453ba am: f60bc5a9 am: 9619144b am: b37a3d0a am: 5793ade0 Change-Id: I00c61a56f5feed5d654f8a876d21a995bac6ab36