Updated from global requirements

Change-Id: I692c2943b2d3edefd219051c38333bdb6a3c885c