Updated from global requirements

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