Updated from global requirements

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