Normalize requirements

Change-Id: Ib6c6badf976814c74b0d18fbd59b89a51ea80098