Fixes: 334312256 Flag: none Test: manual (no visual regression) Change-Id: Ie20dc8d4bb0c85a8a256b001fbb92405679618a8