Sync with global requirements

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