Updated from global requirements

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