Updated from global requirements

Change-Id: I9b24a52c0456d7b84933e15ed61445be746dedad