Merge "Repackage APK to resolve testCheckSignaturesRotatedAgainstOriginal" into tm-qpr-dev