Merge "Quick build fix: Revert "Add pre-order as a pricing type for ContentInfoExtender""