Updated from global requirements

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