Updated from global requirements

Change-Id: I5ea2366cb7757164db8b1c8b65c8fa92cc05dc21