Bug: 129287265 Test: manual Change-Id: I8431eb27cc4c6dfd3048b28ff635474f14433308 (cherry picked from commit 32e85796)