Better indentation of that file.
Small changes to match internal version.
Merge commit 'd3d4f2032a66a9fe91ba5b4ceca114b4690330f5'