Updated from global requirements

Change-Id: I2e275bda23033034ed356e012147ce7a701d4695