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

Change-Id: I35d4f5403641f5faf2711b88b0a9e6f6bc53efbd