Updated from global requirements

Change-Id: I0cd4932a576e5677217f2a6cc31b4e809079501f