Updated from global requirements

Change-Id: I9f9a2efc66b1f6644678cbdefb150353a3b1cc41