Add support for Flow's terms of use

Change-Id: I72687bb7cf36a61408c233908fa59b645d3bb731
Depends-On: If92eaa980e36ac6497a8b97c7272c8393ce431bf
Merge "Add support for Flow's terms of use"