Updated from global requirements

Change-Id: I34fb983a5698313c2e1601d3c688dd36af55d118