Updated from global requirements

Change-Id: I7b0bb541765afe02c69da6163ae6cfeee6b58c7e