Merge "Avoid potential reboot loop due to package cache" into oc-mr1-dev
am: edda7ebdd9

Change-Id: Ide5189580c7b930e4aa86aa68b52460b91d6f8d7