Updated from global requirements

Change-Id: I793b6d86096209c55c934f818242ae3bc58fc56f