Updated from global requirements

Change-Id: I2551912dbcc2cc259c2229332d43c09db9fa9052