am b3fc31a4: Merge "keystore: fix bug in clear_uid"

* commit 'b3fc31a43c941bd6e2ac2acf7d1ffb6350588b81':
  keystore: fix bug in clear_uid