Updated from global requirements

Change-Id: I05e7d3f0b9dad30aa2d352c43f416142000e66c7