Updated from global requirements

Change-Id: I116e92f8942fe9fd353ccaaca0f5a2ea67b448fd