Updated from global requirements

Change-Id: I513c5804f005d5aedafaa15ea2f935bc7a093dc6