Updated from global requirements

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