Updated from global requirements

Change-Id: I631705a6911f34197e9c99c81aa0025d3b9ef02c