Updated from global requirements

Change-Id: I17f8130c00fd933e5baafb127b41fc8e3fdbafff