Updated from global requirements

Change-Id: I1cf6522ca502b4cbc295403342e90882b3bd26e2