Updated from global requirements

Change-Id: I809780fd6ba6cbe647656b4c6d1f9a1cdac596bd