Updated from global requirements

Change-Id: I41f431880d35b4f5841fc1ad602833c863ce5183