Updated from global requirements

Change-Id: Iaed3965166e01fcaf0e9da75ffea3426cda0750e