Updated from global requirements

Change-Id: Icce4f5f2c18590596157a9634bb51f43f225ac29