Updated from global requirements

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