Updated from global requirements

Change-Id: Ib0db135cc10b0d0988680ab7ebcb0cc1c8f6bf42