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