Updated from global requirements

Change-Id: Ib07b647a3a9a12d4f65b99312a5c1f6b7dbdaa8e