Partial sync with global-requirements

Change-Id: I21e1b84933348e62a6cbeac2ba08952b26fffba6
Merge "Partial sync with global-requirements"