Merge "Make keystore2 unit tests less brittle"