Bluetooth: BLE app tracking fixes
am: 6689f33436

Change-Id: If01dfa47d4d616f2455a7800c040cb0000f21d52