Updated from global requirements

Change-Id: Icb78fa27d169c9667a982d9f1d3a0cde10f808d8