Updated from global requirements

Change-Id: Ic8dc00c0cf55a5d95429e3a75675e7e93bc606e0