Sync with global requirements

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