Updated from global requirements

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