Updated from global requirements

Change-Id: I0319551fda2792546afa4e4af4f609a4a6832c39