Merge "Fix BT a bad/ out of bounds array read" am: 7da7696e07
am: 3e5b229b14

Change-Id: Ic087f8ab710e00b55a7174da329563a51e10c3ff