Updated from global requirements

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