Merge "Update cross-profile intent resolver." into nyc-dev