Updated from global requirements

Change-Id: I0e71d7dffd570168a30cbddee62540cfb0c9463f