Updated from global requirements

Change-Id: I3cb6f8f727b7958bbf608b7ad3f42bd00411c1e1