Updated from global requirements

Change-Id: I7ac9a3db15d6fff36e626d74fedfb35a5ecd0532