Updated from global requirements

Change-Id: I3ad3df48d9ed9223affc81174940448bdad25995