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

Change-Id: I3fd60202b73e6905e14f908f739cb53a8fe722db