Updated from global requirements

Change-Id: I7b43efd4eabd98630c2585833097d612aba5dd74