Merge "Update permission names." into oc-dr1-dev am: 104047133d
am: c47a292381

Change-Id: I0734827cb2386cde98fd6aa4052fcfeec1afa920