Updated from global requirements

Change-Id: I2d8f240009d2f847b321baa011880f753783be83