Merge "Track keystore binder changes"