Enforce that all consumers have basic rights

Change-Id: Iaf25f3ac7a2105261aa999cfd0bff5b447863941