Updated from global requirements

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