Merge "Fix the wrong parameter when calling read_metadata_from_package()." am: 6014db5da6
am: 5da7e41ec8

Change-Id: I56222c4a4bf245ca7c5a9506750125f23bed443f