Bug: 149109279 Test: visual (on walleye and crosshatch) Change-Id: Iaa29965f63ae92c26f6924e4934eb7cb6b2754ce (cherry picked from commit d35002d3)