Made changes from discussions in go/skia-skps-3-2019
NoTry: true
Bug: skia:8653
Change-Id: Ia9c8b02fd87d61f0282fec97bc4adc510abefc01
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201642
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Eric Boren <borenet@google.com>