Updated from global requirements

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