Merge "Revert "RecoverySystem: Fix the issue in installPackage()."" am: 9311dbf9e4
am: 731445ebf7

Change-Id: Ia111f153277e0648ea4d3f37d7c928621cd21ca2