Updated from global requirements

Change-Id: I8a109bdb8700ee80d55334034bbac193a3c405c3