Updated from global requirements

Change-Id: If922123e7cffb4a5caa748781a11c4415bd91b22