Updated from global requirements

Change-Id: I76f8003d3e387bd67a017435d21dc340c7ff0124