Couple of upstream/bootstrap items missed in rebase

Created by  Tyson Whitehead  on April 8, 2021
GIBB5PLI6SOJ327W6ACD6VSUENZGXGXX6WIMYTM5JH7YUP44QZRQC
Change contents