Merge "Track keystore password method changes"