Updated from global requirements

Change-Id: I8bfb970022fbed858ee80752f61eda5759acf2a1