Updated from global requirements

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