Merge "Adjust for minor changes in the native keystore client interface"