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

Change-Id: Ibcf02d6e605d1ce7020ea3077b78f24a62b4db57