Updated from global requirements

Change-Id: If762d2f24887005749f459846a327966aa749dd9