Updated from global requirements

Change-Id: I555936f97126ba59443e7f5ebb5286fc9489e3f9