a2074857dc
Bug: 122347746 Test: visual; on taimen, marlin and walleye Change-Id: If6ac1c75297dd25ad40d3ec61537e8793bceceb7