Merge "Fix backup and restore of package blocks" into oc-dev
am: 2686322e71

Change-Id: Ic6d42f58038d7a4feead2f5a3c2c03f11f71e79e