Sync with global requirements

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