Updated from global requirements

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