Updated from global requirements

Change-Id: I4b9a32cbe96d51f9cf11f94d771d54a10937cd4f