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

Change-Id: Ic13d9387c83aad189b3789cd0df58b008d27d527