Updated from global requirements

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