Updated from global requirements

Change-Id: I1972a4a16ca8a87824f873ba56975073a5a885f7