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

Change-Id: I6abd6becaf54fd59abe894fc6c71c46ce4361c8d