Updated from global requirements

Change-Id: I04f02d648a9d1d549e3a878258d9f3a319ede5bd