Updated from global requirements

Change-Id: I785200e3fb86b304f2605779231b8733f38f1d2a