Bug: 69478425 Test: ran test with and without fix for bug Change-Id: I9cc85c9c9cfb50ede119a4ad55b3fcd638d81076 (cherry picked from commit 15cbfdc7)