Updated from global requirements

Change-Id: Ie5d5c4ff3516a4097c23ea0dabb6d3a9bbf502fe