Updated from global requirements

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