Updated from global requirements

Change-Id: Idff5239d264bc44923e4091e86203127db74ebd0