Merge "Pass calling package to resolution UI." into oc-dr1-dev am: 776220d029
am: f60773b22d

Change-Id: I4d21f823af658701f7ffda1671d22eeee761cb57