Updated from global requirements

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