Updated from global requirements

Change-Id: I43728c0319f57d973bbf52bb3ef840b8135c14de