Updated from global requirements

Change-Id: I955e4e3bcf0c1f04f8f83a85447048f1ca3f2c38