Updated from global requirements

Change-Id: I80d6e02b5daaa0862e4b1f15d1bf3211dc0f359e