Merge changes I2d30b75c,I57ecf4f5

* changes:
  Switch to using list of subIds for policy generation
  Switch to using list-of-subIds for VCN selection of underlying networks