Improve resolver layout in case package name is shown.

Change-Id: Ib2bd0c19727194205b6e4114c34bf96663030d5f
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2