Updated from global requirements

Change-Id: I2001dd573d8868bc4d9e86424d123112173a5930