Updated from global requirements

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