Updated from global requirements

Change-Id: I2943bbbd36db34f41d0f95271f553e101b4c41d0