Merge "Fix Keystore 2.0 related bug in gatekeeperd."