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

Change-Id: I6cb55b29361f313f03a34e3a59c0679481307caf