Updated from global requirements

Change-Id: If074e59b33375eeb8de892106d9b10a8a6bd7129