Updated from global requirements

Change-Id: Ic4c2129cdefa66075b3e1f1013672be5ca9065a2