Merge "Check READ_EXTERNAL enforcement outside of lock." into jb-mr1-dev