Updated from global requirements

Change-Id: I84e95ff3dd6ab0e742e91ec4229f67362ac7a3d7