Updated from global requirements

Change-Id: Ia39fc75c71930c6d921596bf04de29f51d842bf8