Updated from global requirements

Change-Id: I3340dc493b1f1e4eb0f872478750842d1074c6a7