Merge "Disable in-place vdex update"