Bug: 240937964 Test: visual Change-Id: I8170879b529a1f17e98397cbc189aa5d507b347e (cherry picked from commit 093f54e976)
093f54e976