Updated from global requirements

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