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

Change-Id: I11ef776dc9ed388ee74a0c50f1e8857c176a54f9