Updated from global requirements

Change-Id: I09953c528035bf4789313580c6e151b4638de898