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

Change-Id: I2940aafdf07b572ee69d988599a2f8084c290dab