Sync with global requirements

Change-Id: I4c00ffd311d22dbdd1d48caa32d69535e155e69e
Merge "Sync with global requirements"