Merge "Track addition of Flow.* to the public API."