Updated from global requirements

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