Updated from global requirements

Change-Id: Ia8adec32f14f8faa063c90bafe0b7cd8043c6510