Updated from global requirements

Change-Id: I2e2c06e147edf529e713840ca6cb3c4111d1d27f