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

Change-Id: I902c07dd5ef4fff5bdab273b2ed81d15f4680d9a