Merge "Cleanup keystore password changing and unlocking"