Normalize requirements

Change-Id: Ie90fe4bcdf282d1ccdee429dfcc9081d5eea6a15