am 30b849b5: am 33fc242e: (-s ours) am 5a620488: Merge "Update/add strings for permissions UI changes" into mnc-dev

* commit '30b849b503cce8e6e905ca94fa24f312c6823b37':