Test: Manual Bug: 73659459 Merged-In: I10cf40bf32dc30393dd538477aaa411a48b4ccf2 Change-Id: I10cf40bf32dc30393dd538477aaa411a48b4ccf2 (cherry picked from commit 5f1186ec)