Updated from global requirements

Change-Id: Ifd0c916fce2d2d476331f06fc0052f191247e2c6