Updated from global requirements

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