Updated from global requirements

Change-Id: I872d960925a9027ee2343d16f994bf54044d6bd4