Updated from global requirements

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