Updated from global requirements

Change-Id: I778a0c00da51cdc52cd67d1b273d52e84d68992b