Updated from global requirements

Change-Id: I771df626a05a33b05eff351ae43f1716f283c016