Updated from global requirements

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