Updated from global requirements

Change-Id: Ifbb36ef8ff11e92aae7854cb5830c432b0dfbe78