Updated from global requirements

Change-Id: I60f43640490e647d1e13686e67f4d53941eab67e