Updated from global requirements

Change-Id: I8f751e0daebf807eacce4aa7c2baeb9c609dee5b