Updated from global requirements

Change-Id: Ifa2e091bd4f63e0f95a2ada88d5e63df47b910cc