Updated from global requirements

Change-Id: I6a2fe617cab3370b13de3e45f52076e53d260724