Merge "keystore: fix bug in clear_uid"