Updated from global requirements

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