Updated from global requirements

Change-Id: I9caff449b9033862d0e50281837bb60d0553710e