Updated from global requirements

Change-Id: Ia0aca6b3e7d1797dcca6da36889196a50acc57ea