Fixes: 136033465 Test: visual inspection Change-Id: I7231ed7cd659ac594c316eb884aa5caa72bfea0b
mentioned in commit 52d618f7