Fix outdated changetype; flow-* prefixes were dropped a long time ago

Change-Id: Ia37a6bdba5493e251756def6200ee10a37de4a79
Merge "Fix outdated changetype; flow-* prefixes were dropped a long time ago"