Updated from global requirements

Change-Id: Ia1fe0328fe5fd8464af70c03bdab10496fda6a7c