Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into oc-dev am: afe32d2fb1
am: 96ce732cba

Change-Id: Icdc667537d1b139bc63f2bf1da763a10695da04a