Updated from global requirements

Change-Id: I2b68fba8b97f137ae466a4e3ae6cb0ca7f6b4f75