Updated from global requirements

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