Merge "Enforce permission check before identity clear"
am: e8777aec44

Change-Id: I4e5d5482fc9f8e795db0bfa2c8a46986fed6f04c