Sync with global requirements

Change-Id: Iad82b688da07f3aa83a9850b5ea9fe2beb51019e