Merge "Fix issue #10491028: iabv2 test apps that contain subscription SKUs..." into klp-dev