Updated from global requirements

Change-Id: I2e2bd3a38458e1307bcc0410da74dc76c0a5987a
Merge "Updated from global requirements"