Sync with global requirements

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