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

Change-Id: Ic99e657d13ee7a6390aa1af57ce3b85925e953be