Updated from global requirements

Change-Id: I7f7714625a6cfb6bd8e0d313d27e898e178a1efb