Updated from global requirements

Change-Id: I2e274ccce3ed6a143530f2aac4d8817beb44ed5b
Merge "Updated from global requirements" into milestone-proposed