Updated from global requirements

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