Updated from global requirements

Change-Id: Ie3d064468c35c1cbd3b70a60f8a3fceb2df95352