Update Flow for Ib9aa3a6c

Change-Id: I9d64b403b9bdeaabd2b5e31e4206f2b84b28a7e1