Updated from global requirements

Change-Id: I75172700283a95e1e056b8ee35688e9a83321e72