Conflicts:
	app/code/Magento/Checkout/Service/V1/Cart/ReadService.php
	app/code/Magento/Checkout/Service/V1/Cart/WriteService.php
	app/code/Magento/Checkout/Service/V1/Data/Cart.php
	app/code/Magento/Checkout/Service/V1/Data/Cart/Customer.php
	app/code/Magento/Checkout/Service/V1/Data/CartMapper.php
	app/code/Magento/Checkout/Service/V1/PaymentMethod/WriteService.php
	app/code/Magento/Checkout/Service/V1/PaymentMethod/WriteServiceInterface.php
	app/code/Magento/Checkout/Service/V1/ShippingMethod/WriteService.php
	app/code/Magento/Checkout/Service/V1/ShippingMethod/WriteServiceInterface.php
	app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php
	app/code/Magento/Quote/Model/ShippingMethodManagement.php
	dev/tests/api-functional/testsuite/Magento/Checkout/Service/V1/Address/Shipping/ReadServiceTest.php
	dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/ItemRepositoryTest.php
	dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/Billing/WriteServiceTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Address/ConverterTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/PaymentMethod/BuilderTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/PaymentMethod/ConverterTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/ReadServiceTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/TotalsServiceTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Cart/WriteServiceTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Coupon/ReadServiceTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Data/PaymentMethod/ConverterTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/Item/ReaderServiceTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/PaymentMethod/ReadServiceTest.php
	dev/tests/unit/testsuite/Magento/Checkout/Service/V1/PaymentMethod/WriteServiceTest.php
	dev/tests/unit/testsuite/Magento/GiftMessage/Service/V1/ReadServiceTest.php
	dev/tests/unit/testsuite/Magento/Quote/Model/Cart/ShippingMethodConverterTest.php
	dev/tests/unit/testsuite/Magento/Quote/Model/CouponManagementTest.php
	dev/tests/unit/testsuite/Magento/Quote/Model/QuoteAddressValidatorTest.php
	dev/tests/unit/testsuite/Magento/Quote/Model/ShippingAddressManagementTest.php