Updated from global requirements

Change-Id: I4940041f67a8e208a32593b9e41cb2bdfe5f5803