Updated from global requirements

Change-Id: I18f14ce95441c77b080227e2cf7125bd219675f3