MFC - Tracking commit.
Merging r273776 through r273782.