Updated from global requirements

Change-Id: Idf9d35d3627eca1cdff4fefef48a5291bf6b0f8f