Updated from global requirements

Change-Id: I4ec828b0b709669e2eec25c05423f9d6c3442acd