Fills in gaps in coverage discovered with code coverage analysis. (cherry picked from commit 09126c5f0e)
09126c5f0e