Updated from global requirements

Change-Id: I86bd795f0e46ce6eda4a99c2f3788027ef9dd519