less fun to address 12008
less fun to address 12008

BS3 commits: d43eb0a513abf19c4c49b9cf7e2d56db6239fafb

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