Updated from global requirements

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