Updated from global requirements

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