Updated from global requirements

Change-Id: I3d2eab22bfd5b35bb6d799b8b924dca147483ed1