This is merged as a part of #1821640 . Closing.