DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated...
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (3/3) am: 12b420aa -s ours
am: 41c718d6 -s ours
Change-Id: Icf9b2a90b0adb3d9645bd6839ed9c244ba8c8c26