Updated from global requirements

Change-Id: I1464a2034497d2520f102294687da3eedd4bcae7