Updated from global requirements

Change-Id: Ic2918967c72adfeff8159ba7b1702c728a84ea34