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