BUG=30481165 Change-Id: Ibd14880aa25907234dd93c38b5d0f2c9e808340e (cherry picked from commit 433fb935)