Merge "RecoverySystem: Verify the package compatibility." into oc-dev am: e3872a4fc9
am: a9fd199fdd

Change-Id: I65c9418a651dd66f274ab6e331185731be10e8ea