Merge "Remove hardcoded keystore password"