Updated from global requirements

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