BUG: 31828706 BUG 30832947 Change-Id: I348ab5642ca625b4700ec63f72414729d574da5e (cherry picked from commit 6e500010)