Merge "Trigger a bug report upon a key store error"