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