Updated from global requirements

Change-Id: I4a0be4a03e6c3590a7cab8f4548a128fdc31d1ca