Updated from global requirements

Change-Id: Ib6675ba16fdde6762ab6e2b6d41f6775b06ee285