Updated from global requirements

Change-Id: I3f2a517c6a02285c804adcee95cb66f1f6502744