Updated from global requirements

Change-Id: I28a03b41b34b327ea33d0d5784e842d4d2d9e254