This got introduced as a result of the Bluetooth API changes. Change-Id: I04ce4a91f0e4f74253407897c2f3973f7b0a0055