am e2e960e0: Merge "Fix PackageSignatureTest#testPackageSignatures" into ics-mr0

* commit 'e2e960e0fd049ce982f9279c7a2c5dd5135d9229':
  Fix PackageSignatureTest#testPackageSignatures