Updated from global requirements

Change-Id: I1e37b16a1a89e26b5fe3a66c245c7b7d50f72cb6