Merge "Solve AppBackupUtils.signaturesMatch() policies" into oc-mr1-dev