Fix issues from previous CL
Fix issues from previous CL

Fixes comments not addressed here:
https://skia-review.googlesource.com/c/10518/

NOTRY=true
Bug: skia:
Change-Id: Ide65115cf3fb19ade5b6e1b5a386d2f109527e6a
Reviewed-on: https://skia-review.googlesource.com/11185
Commit-Queue: Stephan Altmueller <43343ec95731c0e8daa7359daf7f2f3935582b24@google.com>
Reviewed-by: Ben Wagner <3ef7217be91069877d94f7907ce5479000772cd3@google.com>

google/skia-buildbot,google/skia-buildbot,google/skia-buildbot,google/skia-buildbot,google/skia-buildbot,google/skia-buildbot,google/skia-buildbot,google/skia-buildbot