Bug: 205917167 Test: manual check Change-Id: I782938433c17cba6fa26905d117820871ad0bdff (cherry picked from commit 4cc928b8)