Merge "Enforce permission check before identity clear" am: e8777aec44 am: 09b9551f01
am: cfbeeb9625

Change-Id: Icf9b0a59a3447190986e72fa11f72c20347f4303