Fixing styling failures.
Merge commit '7b13172666f2a7b92afb59900f5bb4040ed52b0d' into TextboxPullRequest