Merge "Follow-up to multiple intents support" into nyc-mr1-dev