am 61c0fc41: (-s ours) DO NOT MERGE - cherry pick a Bluetooth property fix from master
* commit '61c0fc41e170c7dd5d7969be80fdf108d9d52f14': DO NOT MERGE - cherry pick a Bluetooth property fix from master
This commit is contained in: