Updated from global requirements

Change-Id: I3983eb27142bdeb2fef7f575dffb0b69905b59fe