Sync with global requirements

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