Bug: 226385494 Test: manual check. Change-Id: Ifdc69b2f79aa56af05a05550db7d05dc62ba14d4 (cherry picked from commit 73f80c96)