This brings the overall class reference completion percentage from 87% to 92%. (cherry picked from commit 5056c427d3)
5056c427d3