Updated from global requirements

Change-Id: I5ba103b74dd1ec258c427a84d6ca92192bb6ff56