fix 10732
fix 10732

BS3 commits: 607b802d2fe8bcf536198d44dd1914212d3b208d

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