Updated from global requirements

Change-Id: I052c52394a81f10628022a54e5e810ca7d85589d