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

Change-Id: I9896d70fea9d69025c1a77d634333d160a71acb6