Updated from global requirements

Change-Id: I2e2333c948ecfca638f4a1004e5256611735a03c