Normalize requirements

Change-Id: I9d9da74409f7e4325322fded6207c7e98eda7bdb