Updated from global requirements

Change-Id: I1ae5d64f89c0207a4e83cd18d7b281620520af57