Updated from global requirements

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