Updated from global requirements

Change-Id: If802220bebc8f213322b21771f09bb15236a33b6