Normalize requirements

Change-Id: I6632d744df5f2b51dee3f79ca3dd540d127f78de