Updated from global requirements

Change-Id: Ifa8e1b2b46d970f045d3597b19c10e4105b79c52