Updated from global requirements

Change-Id: I5a6784cf358419d59bee7257a293aa0d19d1b363