Bug: 73134851 Test: manually tested Change-Id: Ia95a8aa48789652d6af67a542f62353a7bf13607 (cherry picked from commit 4d2a3ef6)