Updated from global requirements

Change-Id: I4a8e986d4ab3d35571aa431f23ab6f8d8f66c9fb