Normalize requirements

Change-Id: I520d31adb16d03011c15279076f401f4650589d9