Updated from global requirements

Change-Id: I8d66a3074d610942bd0b8639dfc44cf6ee496dce