Merge "Allow non-mainline package rollbacks"