Updated from global requirements

Change-Id: I6577220bc26b761197adf2f6a51aa701bd4a8b92