Bug: 134594642 Test: presubmit Change-Id: Ia0834a76e7ae9a222ec2698dcd989317bb20f2a0 (cherry picked from commit 7f000e1d)