Bug: 261696870 Test: npm run build:all && npm run test:all Change-Id: I6c097e46bccf2cf7a31d7cf000733d0c40f6ac66