Fix part of 15148.

BS3 commits: 8777803acfb364a7cf10ba809d451432a6aa0a3e
grunt

BS3 commits: 28d847a1e03005403a0bc01e3328edf7598656cd