Merge "keystore: fix errors inside ALOGV"