Merge "Keystore:Expected exception for invalid Keys"