Updated from global requirements

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