Merge "Additional changes to support Bluetooth Beam."