Merge "sysctl: promote secondary ip addrs"