[automerger skipped] [automerger] Fixes two bluetooth bugs causing remote...

[automerger skipped] [automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am: cd26d8d6 am: 2e1be2f7 am: 5ba11e61 am: c4328ca9 am: 0d822c34 am: 1a805d59 am: fd6d1428 skipped: f61002c7 am: dfaddfd4 am: cd26caf8  -s ours am: 5f5f2591  -s ours
am: 8b764756  -s ours

Change-Id: If4ca3971144b15fe541378eee3c76261001409d4