Merge "Pass calling package to resolution UI." into oc-dr1-dev