Updated from global requirements

Change-Id: I07b7b38b25311ebe2a014632f7e1eb6ba80cfbbe