Updated from global requirements

Change-Id: If395bc6eaa9c6a8c8cd6ea27477fdd7e21db6341
Merge "Updated from global requirements"