Updated from global requirements

Change-Id: I29251e2ccc1eaa60a77630364eb80c36ae383d78