Updated from global requirements

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