BUG: 30692618 Change-Id: Ibe3589e1248520067714d5a20963a17935789066 (cherry picked from commit dc74142c)