Updated from global requirements

Change-Id: I11640390b2eacdb73aba30ca56e6a5d7ee44e36a