Merge 18.6-rc-2 into trunk#11492

samiuelson merged 4 commits intotrunkwoocommerce/woocommerce-android:trunkfrom

merge/18.6-rc-2-into-trunkwoocommerce/woocommerce-android:merge/18.6-rc-2-into-trunkCopy head branch name to clipboard