Merge styles order#4664

Merged

dzearing merged 3 commits intomicrosoft:masterfrom

dzearing:merge-styles-order

Apr 25, 2018

Commits on Apr 24, 2018

Commits on Apr 25, 2018

Adding nit fixes.
dzearing
committed