BUG: 30139400 Change-Id: I1798607af13c9be5e1f21212fd7078f7152562bd (cherry picked from commit 9e325706)