Merge "Cleanup package_string() and its users" am: ca7fbd546c
am: 423ce930f6

Change-Id: I72a02952935b76eb4554b7125806138f59d85c1d