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

Change-Id: Id3a8449eac1c62d16ebf4fdcb1c5b7a581c97a7a