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

Change-Id: I25902a58a6fb7c3866c19d939647174552d99673