MFC - tracking commit.
Merging r272515 through r272527.