Updated from global requirements

Change-Id: I169d7dfca9cad4bac40152cf83756adade3204a8