Merge "Fix minor LE descriptor permissions issue" into jb-mr2-dev