Update Flow in wmf/1.23wmf15 with two cherry picks

Change-Id: I956f121c61ada067ba1deb215b641bff6537a5fe