Updated from global requirements

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