Updated from global requirements

Change-Id: I076e205d326c8da4e72032d81e46be21cba8ebe5