Updated from global requirements

Change-Id: Ic0f7822b7ff2cc201c7723e7b220cb5c87a70cb0