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

Change-Id: I075bd3eba3f253a23a2a39d4af01ac96685170e8