Updated from global requirements

Change-Id: I95c80f36e090cea29e53721fba067c0004011ca4