Updated from global requirements

Change-Id: Id3543e912346b5a6113f631770515fa2fd1080fe