Updated from global requirements

Change-Id: If137689e5b9008c51cea16d41e648f0df490a247