Updated from global requirements

Change-Id: I54a500885a9944353c86919aba68c2aa1bdbe878