Updated from global requirements

Change-Id: If561d6513a0720192e188af4d13e87dafbeab3fc