Updated from global requirements

Change-Id: I1fd1942d417aadc00fbfa3c7bc6286c421aa38de