Updated from global requirements

Change-Id: I43b1fd3ee22abbd9dfd23516b31d9417cb265c81