Updated from global requirements

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