Updated from global requirements

Change-Id: I19a010d58c9a3135c5fe1051ced64772f3673f46