Updated from global requirements

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