Updated from global requirements

Change-Id: Iee84a0882e82784928418fecd83d862c0ce1e8c0