Re-implement terms-of-use

Change-Id: I1432d0914d5415465a2c375140428407f1b80405