Updated from global requirements

Change-Id: I1770c8f0a05e087889c4b573675f70cb7d1dd617