Updated from global requirements

Change-Id: I38b7a9d0c9e60c95c302c904961d4ac8197b5c15