Updated from global requirements

Change-Id: I0eeaec761268fc4bc142939e191026c0411c162b