Merge "Track addition of Flow.* to the public API."
am: 2120eced38

Change-Id: I17be3b21c3b02b00c30d175c0bf513b2cb4efc85