Updated from global requirements

Change-Id: Ia26291498b58af40d9598233e69038b1051d3227