serialization related fixes for flow related classes

Change-Id: Id7e1241cc73645bd87b61eac4ca45acd35ad22ca
3 files changed