Updated from global requirements

Change-Id: Ie3fda56d4fe5f581604da2950beb3ce97974549c