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