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

Change-Id: Ib47cff0e1c8a73539dab75c3447d5ffc58bbaf16