Merge "Bluetooth 5 spelling fixes" am: 5465fe0a2d am: 58569de4de
am: 2ebaf34259

Change-Id: Ic0ca716afc1f6a900b4c4455d8ff520abef5fb31