Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev