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