Updated from global requirements

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