Merge "Add systrace for resolveIntent()" into nyc-dev