Merge "Keystore 2.0: Make Bluetooth app ready for Keystore 2.0 part 2."