Updated from global requirements

Change-Id: I13875dc6def187898bc4e3ff8da4770fc30cde49