Merge "Add support for iif rules."
am: 60a057589f

* commit '60a057589fa095a7fed16ea52a927916ab153781':
  Add support for iif rules.