Updated from global requirements

Change-Id: If6f5a0feae93436fb7374a522ca7c72a26389c9b