Updated from global requirements

Change-Id: Ib88c2091ed83abcff6f7692c1dc8a5bad1fa7cae