Normalize requirements

Change-Id: Ib72a0f2e979960371210787037196031a4ac1fd8