Updated from global requirements

Change-Id: I2f5fdc743a085237d2ed825511b271a7f9bc2e08