Updated from global requirements

Change-Id: I060f60cb9d10f5406a70f2210018eb3814313c07