Updated from global requirements

Change-Id: Icad0fcf4125b4aefac7ed8f0df5bef2c6ee64594