Updated from global requirements

Change-Id: I72766a6075133301fcc879e4c2d5126bbe56f9da