Updated from global requirements

Change-Id: Ie62f7d7122538685db76240ce7b5d748aa623a87