Updated from global requirements

Change-Id: I93f37a5b47911c3d10c8c186f9d288136cd262ea