c1ee0d5121
Bug: 122347746 Test: visual; on taimen, marlin and walleye Change-Id: I92776086e7114f4ae4d07c92e04694782fcb33e8