Merge "Update Keystore with new fields for API V3"