Merge "Allow APK rollback without rollback capability on previous key" into sc-dev