Updated from global requirements

Change-Id: I8d393166d3e8d4c2c115e2e07ba9904073ce1d3b