Match global requirements

Change-Id: I02d6a5b5976d76cae368c937ffb58e47cdc5cf90