Sync with global requirements

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