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

* commit 'f9e010c6fef768a919cdc11df8932131da9ec512':
  Add support for iif rules.