Normalize requirements

Change-Id: If6329157a3ad3a5eabcd4abb54af762ea45dbe50