Match global requirements

Change-Id: Ie1775f8af7272f8dce7b8e6f96c04cac16a04ea2