Updated from global requirements

Change-Id: I1bfccc0646f2bce0222656dc9d3696bc46f452eb