Updated from global requirements

Change-Id: I04c0540f15e0cbd0288dd3e62e49322e679f248d