Normalize requirements

Change-Id: I9e3715c145dd80213f3bcec9e68b5802d297e96a