Updated from global requirements

Change-Id: I201c1593fc12cd2cac3db30e35483320cf0ed663