Updated from global requirements

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