Merge "Fix typo around BLE_INCLUDED inclusion bug 8566685" into jb-mr2-dev