Merge "RecoverySystem: Enable the package compatibility verification." into oc-dev
am: a532f4d7f8

Change-Id: Ia44184bcefda25a8cbf362d4b911713669bace32