Updated from global requirements

Change-Id: I095ca724e48e55286839b6aac8dd0398de14f538