Updated from global requirements

Change-Id: Iec20b73652f3d2cec8cfe7fa9af2548f9c7bd164