Don't force WMF terms of use upon everyone

Depends on Iadba5c65b90913e30fe41ae0f751ce6642f37501 from WikimediaMessages

Bug: 53902
Change-Id: I8093be3043ac5046e28858205efbc715e8370bd5
Merge "Don't force WMF terms of use upon everyone"