Update 1.25wmf9 Flow with cherry-pick I5e0490d0

Change-Id: Ib4d3fce02e79845e5d985658063870189cf7bc05