Updated from global requirements

Change-Id: I1150d3225816871df9f54bfc3521056753508445