Updated from global requirements

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