Updated from global requirements

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