Updated from global requirements

Change-Id: I09331634dc4fbc0d7bb9030eea6bb36e4db5f8e7