Merge 18.5 final into trunk#11482

samiuelson merged 3 commits intotrunkwoocommerce/woocommerce-android:trunkfrom

merge/18.5-final-into-trunkwoocommerce/woocommerce-android:merge/18.5-final-into-trunkCopy head branch name to clipboard