Updated from global requirements

Change-Id: I723eac707b94f7d93751188a6b1fa340e33845ad