Updated from global requirements

Change-Id: I7c100b951689561919dd925f13b09be638c05aab