Fixes: 255775000 Test: manually update goldens Change-Id: Ieb94704e408e0e9b53bd8599af52e012b40c644e
4017df44ea