BUG: 30117577 (cherry picked from commit bffdac58) Change-Id: I7251d907789a2b8ecfcd762618c768346bc9ff40