Small fixes in create flow
Test: Locally built & deployed
Bug: 253155431

Change-Id: I0bd6b3dadf7cb1b228feeb7cfeaa0fe4b210510b
2 files changed