Updated from global requirements

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