Updated from global requirements

Change-Id: I1cf8d174dac5f6c40970a0cd73dfc15b10ed6c33