Sync with global-requirements repo

Change-Id: I2a929442beb6058d941142fb6ec621243139bd91
Merge "Sync with global-requirements repo"