(cherry picked from commit e123f061) BUG: 31828706 BUG: 30832947 Change-Id: Icd5117d655f1197524b39fe7bc1b11c4d920093c (cherry picked from commit c78db969)