Merge "[DO NOT MERGE] Revert "Add BIND permission"" am: 16b26c20f8
am: a1ece6007a

Change-Id: I01f1a7f456109ddc72a531f7156a8fc005255fd3