Updated from global requirements

Change-Id: Ie31a0772e62e6522186cf6f8bf8b8f032713786d