Updated from global requirements

Change-Id: I7533b7bbe1820f8c05881f63e070f6825bc0276c