Updated from global requirements

Change-Id: Ic34607a6a926eb131254a71efd174e759ad0303c