fix 12484
fix 12484

BS3 commits: 4b194471b0352fa583e074c4394c1fd5085cf832

ztx1491/todc-bootstrap,todc/todc-bootstrap,2947721120/todc-bootstrap,todc/todc-bootstrap,todc/todc-bootstrap,2947721120/googlebt4,mozillo/todc-bootstrap,up2vs/todc-bootstrap,aaroncnhk/todc-bootstrap