Normalize requirements

Change-Id: Iddfb3bb72e3a956bfcbbab7c766f7c159bbf1478