Updated from global requirements

Change-Id: I2bb0ae068bd37eddd869da0ecca5bcced2991546