Updated from global requirements

Change-Id: I7d73b83a6bead795352c208d6241aebfbbfb2cf3