Updated from global requirements

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