Merge "Revert "Reduce duplicate strings due to the package cache."" into oc-mr1-dev
am: f6764fb7f7

Change-Id: I3cfd72a897157c29d19956be302dbc47cffc03db