Updated from global requirements

Change-Id: I8ce335574b4689c1d86f21733911c74160d2b8ba