Merge changes Ie536db6a,I69a33aff

* changes:
  Use iptables-restore to set the incoming packet mark rule.
  Log how long it takes to start more netd components.