PR: 236616, 244847 Submitted by: kevans MFH: 2020Q2 (blanket: major runtime build fix) MFH-with: r531689