Updated from global requirements

Change-Id: Idfd98de5571e544f2378087e49afa978a577c3f4