Updated from global requirements

Change-Id: I6baee28309b602c756bcfeab5ed7c66f7bdaee07