Merge changes I8a0ac7a3,I964b7664

* changes:
  Reorder the commands in whitelist chains.
  Use IptablesRestoreController for UID rule updates.