Updated from global requirements

Change-Id: I4906314c25c78b5997e0383d9c78620eb531e6ee