Updated from global requirements

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