Comment From: ilayaperumalg

LGTM, merging along with a few other latest check style fixes.

Comment From: ilayaperumalg

Merged as 865d4294