Updated from global requirements

Change-Id: I33683ba9b102b9bb33d13a6e898f6be0a48e0b41