Updated from global requirements

Change-Id: I29a8435804256296fe91781a2069788d8ea6d246