Updated from global requirements

Change-Id: I19607c757d699065dc0cec655548ae83260ead3e