Normalize requirements

Change-Id: Ia2ab0b9e49bed12baf74d9a698e4942eeca28d91