Updated from global requirements

Change-Id: I96b53ce825ca0f940596f53058b8e3c80463ac3c