Merge "Remove uuid when device leaves bonded state"
am: 0e0247b53c

Change-Id: I535e62f28a904d27e4d2c4776a16b0657cd07b0c