BUG=skia:5597 GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2199273002 Review-Url: https://codereview.chromium.org/2199273002
BUG=skia:5563 GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2175373002 Review-Url: https://codereview.chromium.org/2175373002