Updated from global requirements

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