Updated from global requirements

Change-Id: Ide0d9d133bdf3635b41d6ea62e4839a4061472a0