Merge "Prevent phone's bd_addr from appearing in Accounts"