Updated from global requirements

Change-Id: I2521bd0e356c2632444ccdfbf940243c2ff4d323