Updated from global requirements

Change-Id: Idd7f6e4195248618bb1e82a76e92336f4633165a