Sync with global requirements

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