Updated from global requirements

Change-Id: I2f274bc8e65e5bbb60b3bd744f2386b8c13f089a