Updated from global requirements

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