Updated from global requirements

Change-Id: If396742d41a181f7a589cc133d81d1df7c1461d9