Merge "Sysconfig takes precedence over update-time autoVerify"