Updated from global requirements

Change-Id: I38af70302485e92aa27d7d3aa94811b56ff17094