Updated from global requirements

Change-Id: I062188306f9607bde183cde26afdb8be788e67fa