Updated from global requirements

Change-Id: I05b251ce54af888229910eefb39db582c60c6d84