Merge "Preparing for work on string interning for AppImages."
am: 53f9dc2cf1

Change-Id: I05ea6605aea1f476859d9d0636a19a71faa75770