Bug: 79597307 Change-Id: I9e38be154ade3ec16def1655d84673421da8ee24
mentioned in commit 1e9ab9ef
mentioned in commit 194ae768