Bluetooth: BLE app tracking fixes am: 6689f33436
am: bb95a879fe

Change-Id: Iac6af1d71bf6b37915f9da0fb4209d8e5fb1a33a