Merge "Cleanup keystore password changing and unlocking" into mnc-dev