Merge "Dynamic policies: support for device selection" into nyc-dev