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

Change-Id: Iee19cd18f61ec5b7572e0aa71468110ea1b370e5