Updated from global requirements

Change-Id: I1db47c96cf465e6378e783ce5240bb0b46b6c534