Updated from global requirements

Change-Id: Ib0934a75cd44168aab4d35f2e9be0fff2fb56848