Updated from global requirements

Change-Id: I71a52297a95550c5b89a328c171cb43afab53a1d