Update Flow with 88bit uuids

Change-Id: I76d8841945352acb7262c5f37fbe1dc2526139ef
Merge "Update Flow with 88bit uuids" into wmf/1.23wmf12