Merge "Do not remove uninstalled packages from journal" into oc-mr1-dev
am: b152fb8d30

Change-Id: I62fd850aa7c91e6fec27736e62d200ee82d27d54