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

Change-Id: I0c51b504d1d54bcbdeb7f4d4ad573a854579437e