Merge "Track changes to a permission name" am: 9212c47f92

Change-Id: I74cce60af7dcd0fcad9dafd3a2cf0c0a253cca1c