Updated from global requirements

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