Updated from global requirements

Change-Id: I99910315496d20da04b1b74a9ef076ef567137a1