Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated...
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am: a053eaa841 -s ours am: e253a74e -s ours
am: a25b8114 -s ours
Change-Id: I111a86ba53a48ab3db3e5211e86afc0a1d2a21e0