am f924e231: Merge "Make UID rules specify "iif lo" to match real device configs."

* commit 'f924e231377fbf13c9ec352b5de0e79501c41c0f':
  Make UID rules specify "iif lo" to match real device configs.