Updated from global requirements

Change-Id: I7dd941f0d5cbe4bc642157a19ec79bc55f81b7b0