Module Assembly - Payment Preference APIs Final Fix

The final fix passed final review, so it might be appropriate to make the pull request.