Updated from global requirements

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