Updated from global requirements

Change-Id: I2ed6046288eb7e91d9e1b0f2e6ad0d703f6e6ddb