Updated from global requirements

Change-Id: I775ae2075cd7483a29364e235bfa086e2555c0d6