Updated from global requirements

Change-Id: Ib9095887215458c335598cbbbb81205eb26ff23a