Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" am: c5680c9b05
am: 16609dfe18

Change-Id: I9c9c500bab98168da48d69cc7e4c93a33b8571bd