Updated from global requirements

Change-Id: I96dfa12efee068be885f8acc94175ce3b60fe827