Sync with global requirements

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