Update EventLogging edit funnel

Change-Id: Ib629cd9f45f70d50ab3a8bc9fe13d6e2e21b731a
Merge "Update EventLogging edit funnel"