Upate flow in wmf/1.23wmf16

Change-Id: I3bc3c042c860958db0b4e0d7aebba85d975428f2