Updated from global requirements

Change-Id: I274214f7924fc2edddfc54a81147a3b17123238f