Merge "Refine Bluetooth Metadata API"