Updated from global requirements

Change-Id: I2128bed5623f5caaaababfddac0f301e97864432