Updated from global requirements

Change-Id: I27e51a831700a6a1f46b33863ed1001f1edbbff2