Test: Manual Bug: 78371063 Change-Id: I5be8950bd093e5d1b412465f429664ac21753caa (cherry picked from commit fd72481d)