Sync with global requirements

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