Updated from global requirements

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