Merge "Update permission label strings" into cw-e-dev am: b69cab65d1
am: 41579ff8fc

* commit '41579ff8fc06ad655e158b1ab825624437489c83':
  Update permission label strings