Updated from global requirements

Change-Id: I948862c12267ac530c5aa136ac490b134b81d41d