Updated from global requirements

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