Updated from global requirements

Change-Id: Ibf40e3ceea875f72986e3d032c17570eb1d5b1c4