Updated from global requirements

Change-Id: I2d0250cbb41d79d0210964f7f99c1c6eeeef1257