Cherrypicked changed accidentally put on integ-home