Merge "Remove permission check in registerAdapter" into jb-mr1-dev