Merge "[DO NOT MERGE] Revert "Add BIND permission""