Updated from global requirements

Change-Id: I3c784f3be3f46e34691d8d931abbb40839cb7447