Merge "Fix File Context Entry for Bluetooth Services."