Normalize requirements

Change-Id: I9df5f48cb3b581d97fecc88092f414606b655c59