Merge "Do not clear critical keys in clear_uid()" into oc-dev am: 48dc4ad3b9
am: 80f5705fb5

Change-Id: I42cc1360583a813d2a18d12c8453bbe5d0e88284