Updated from global requirements

Change-Id: I85276146bd621f905cf57388147d410bd3c56986