Updated from global requirements

Change-Id: I601ace053bf38a23aec8eeb6d43a0189c3342786