Bug: 69787930 Test: Treehugger (cherry picked from commit 214e99a7) Change-Id: I4974131471744f0d6be84f127981298db8adb5e2