Updated from global requirements

Change-Id: I266ff7740cae49c2c33b8536bbdd52db97b9dabc