Updated from global requirements

Change-Id: I634af478c7fa53b8a1cf46e20668f4e74feba751