Updated from global requirements

Change-Id: I74345f78a169282b99ed3575f19afa3ca0548839