Updated from global requirements

Change-Id: I93b47fd044623d45b9facc4cf41f192eb8f6e6bc