MFC of r249848

PR:	174749, 157796