Merge "[DO NOT MERGE] Add BIND permission" am: 8cb27bf339
am: 987f032e1d

Change-Id: I85af9914467505c8d9b45e050875dd16eb9a3bd9