Updated from global requirements

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