Updated from global requirements

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