Merge "Disable encoded static initialization"